Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Dec 2011 07:24:47 +0000 (23:24 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Dec 2011 07:24:47 +0000 (23:24 -0800)

Trivial merge